From 7c020bfaaa95e903b4c4a0ddbaa8aa37e85dfda6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Sun, 12 Aug 2018 13:30:15 +0200 Subject: [PATCH] inspect-button: Remove custom pick() implementation This was added to work around the fact that pick() does not look at insensitive widgets at all, but the replacement didn't properly work either. --- gtk/inspector/inspect-button.c | 45 +--------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/gtk/inspector/inspect-button.c b/gtk/inspector/inspect-button.c index 2ce9ca2d02..489acb3286 100644 --- a/gtk/inspector/inspect-button.c +++ b/gtk/inspector/inspect-button.c @@ -37,49 +37,6 @@ #include "gtkeventcontrollermotion.h" #include "gtkeventcontrollerkey.h" -static gboolean -inspector_contains (GtkWidget *widget, - double x, - double y) -{ - g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); - - if (!gtk_widget_is_drawable (widget)) - return FALSE; - - return GTK_WIDGET_GET_CLASS (widget)->contains (widget, x, y); -} - -static GtkWidget * -inspector_pick (GtkWidget *widget, - double x, - double y) -{ - /* Like gtk_widget_pick and gtk_widget_contains, - * but we need to consider insensitive widgets as well. */ - GtkWidget *child; - - for (child = _gtk_widget_get_last_child (widget); - child; - child = _gtk_widget_get_prev_sibling (child)) - { - GtkWidget *picked; - int dx, dy; - - gtk_widget_get_origin_relative_to_parent (child, &dx, &dy); - - picked = GTK_WIDGET_GET_CLASS (child)->pick (child, x - dx, y - dy); - if (picked) - return picked; - } - - - if (!inspector_contains (widget, x, y)) - return NULL; - - return widget; -} - static GtkWidget * find_widget_at_pointer (GdkDevice *device) { @@ -122,7 +79,7 @@ find_widget_at_pointer (GdkDevice *device) gdk_surface_get_device_position_double (gtk_widget_get_surface (widget), device, &x, &y, NULL); - widget = inspector_pick (widget, x, y); + widget = gtk_widget_pick (widget, x, y); } return widget; -- 2.30.2